Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 06:23:08 +0000 (23:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 06:23:08 +0000 (23:23 -0700)
commitcb5cc04cf898e7d07eea2a7820d2185409180365
tree638c1dd49a83caeb81411818aa30b6fece2b03e9
parentcc0bb7b1c6e1688ba9f89e7fd70660864ae6f4dd
parentf6d8b73b33609516a511cfbb0a13d5aac3b20c33
Merge from trunk.